Implemented ticket #16