fixes #70 and fixes broken test for #63