Should fix #129