Fixing Hobba bug :D