fix for #248

Don't close #248 yet though, need to test this one on the main server -
kinda tricky to perform surgery on yourself ;)