Fixes #138: Proper fix