Fix from @tonikitoo