Issue/#357

fixes #357