Fixed bug in which "," was omitted in applying prefix to @f and @h.
tagged version 3.0.36