Changed to be correct with enum