Fix for 726