Fixed edge case in question udpating