Fixes issues 28-34