fix other places where the same problem can appear
20140305-alt2