fixed stupid None problem