fixes #50, fixes #49