Now with slightly less bugs