fixes issues 24