fixes #278 , fixes #285