update to suggestion by @zwn