Make check in more sensible