Added support for un-aligned fields