now, really working, wrong merge in previous commit