Should fix #271