Bad code fix