[BUGFIX] Class not found error on 6.1