Issue 177

Should fix #177