Fixed #87

Reverted some changes from a4214fc to fix #87.