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

And Savin's shit