Fixed up logic