Bugfix for #77

Small final adjustment