Amended a couple more incorrect cases. Sorry!