Fixing the previously mentioned issue