Fixes #98
polish