Implemented ticket #45