Issue/#308

fixes #308