Resolve bug with input normalisation
SVN 413