Fix #61

May a bad solution, but it will work :-D