Fix for issue reported in: #737