Resolve bug with input normalisation