Fixed #2 - added flag for field variables