fixes #272 (attempt 2)