Fixed issue #70

Finally fixed issue #70 :)