Fixes #406 & #405