sinGle CouRse BuG fiX