Fix for issue #1045. Close.