Fix for issue #1151. Close.