Issue/#343

fixes #343