Bug fix for q3