remove base check and everything is beautiful