Fixed function for q2a v1.6