Fixes #137 better