should now check properly