Version 2.1 bugfix