Partial fix for Quest completion ?