#20: fix by @ChiaYinT