Fixes #283, Fixes #281