Plugin - Fix for 1.7.2