Fix for 745