Changed big fix from earlier to be a more simple two-liner that gets the job done. (tested)