extended fix from 1st of april to other classes