Fixed bug capping at 29