Fixed #32

Same issue as #33.