Work around for goose bug