Should fix #137