Fixes #19, need to be tested