fix errors from 16.09.2013