Fixed issue #17 properly