Revert fix of #47 (Should be done in seperate branch)