bugfix #1025