fix https://twitter.com/tuyapin/status/317386667960987648 and other
thx @tuyapin !!