Hackish fix for http://bugs.traq.io/traq/tickets/358