Fix for Gerry
Rofy's changes