Fix for 1912