Reverting changes from Issue #109 back to its original