Second attempt at Fixing #285