Fix for handleQuestion + merge upstream script