bugfix - Issue#15