fixed #63
tests for #63