fix for 1.8.7 by matching with a regexp