Fixed pre-condition failed #95

Resubmitting as requested :smile: