Merge bugfix #165 into sl6

Merge bugfix #165 into sl6