Minor bug fix, mainly for Chrome