20140730 bugfix