Fix for occasional UnsupportedOperation exception