Fixing unsupported operation exception
Merge pull request #409 from fgaule/fixing_unsupported_exception

Fixing UnsupportedOperation exception due to #283