fixed #61 (was already fixed actually), added something for sanity. Considering this 'final'