Fix #33 and close #34 with alternative fix