1. fixed stupid issue