Fix #615

#615