second bugfix, just like previous