Fix for 2198