Attempt to fix #50

@vipere could you please try this
(since I cannot reproduce this problem)