Fixed hardcoded values for exporting and debugging
Release 2.1.0