Fixes #177-b