Fixes #177: dirty solution