Fix for Greg 2