Alfred's fix
Alfred's fix2