Partial Fix for issue #13