Bug fix: issue#15