Revert "Revert "Fixed the error we were having""

This reverts commit 487420d087da5e20937b0822612334a794fc441d.