* bugfix for issue 164