Fixed 'Evil Joachim' exploit