Fixing IPS / Product bug