Fix #615

Relates to #615