Added support for word formats with x on the end again