Fix for 1399522