bugfixes for 2012