oops, wrongly removed if test