Fixes #146, Fixes #144