Fix #684

Title says it all!