Fixing that stupid bug