Temporary fix for ticket #1239