Fix http://forum.fenoxo.com/thread-8582.html