Fixes http://forum.fenoxo.com/thread-8592.html