Fixed ValueObjectFactory.stg. refs #502