bugfix 2013-05-14-05-25-12