Should fix issue#113