Bug fix for Quest