Fix

supersedes #181