Fix badamount

Ready for review and merge. Fixes #1553.