Fixes http://forum.fenoxo.com/thread-8258.html and http://forum.fenoxo.com/thread-8259.html