[#864] Fix for removed class