Fixed with lexical cast