Maybe fixed stupid bug?