started bugfix, hopefully.