Fix related classes for issue #1451