I think we will have to wait for the release of the next update (v2.5) to solve this problem. There is nothing on the "Calender of updates" for when that will be, so it could be a while.

Mark