now it works after merge!