Fixing Issue #115 by removing optimization