Added workaround to returning user