Fixed issue #50..