I feel like a retard. Fix #5