Fixing code for processing 2.1