Found a hack to fix what seems to be the bug.

http://ask.ttwait.com/que/23041964
Seems to work well.