Small fix - now it works pretty well