Finally fixing #6