Fix for fix #1552