temporary workaround to make 'stay there' work