Finally fixing #670