Fixed issue #19 finally )