Fernando's patch added and working