\#30 still isn't fixed
Fixed silliness