MQ: fixing the magic bug ;)