Fixed incompatibility with #101 PR