Montage fix

This one looks better. It makes some small fixes to your PR.
@wmvanvliet I think this change creates trouble