Implemented issue 241.