reopesn #1627:

 - Previous commits actually did NOT fix my problem.
 - This commit fixes the problem for me.  Is there any other places to
   be fixed like this as well?