fixes #614
fixes #613