Fixed wrong subclass (was not backported properly)