Fix for #158

Look #158