Fixed a bug that, well, was making this gem a bullsh*t