Just doing the same as was done elsewhere, will change the whole function for consistency.