critical bugifix