Fixing issues 32 and 30