Moved previous fix to a better spot in code