fixed q bug