trying to fix issue #156

@mukkoo I can't reproduce by myself, but almost found the not-so-much-a-bug. Please, **try patching your local code before merging** this pull request