Bug fix to extension, now also supports griffon.