removed forceUpdate
fixed null ref / no head