Fixes #186, Fixes #187