removed frivolous check to make things simpler