Fixes #256, Fixes #257