Fixed dangerous code