Move to case where possible