Fix (2) for 3fdcf9de37878aceddf064a5f099bfb6696cdcb1