Fix for registry list