simpler end and guarding against dummy
1.0.4