Found weird bug, hopefully last commit