Fixed lulzy bug, maybe a regression?