Fixes Issue Â1178 #1595