Should fix #26