Fix for 2930