Fixed issue with getFields