Should fix #124