My personal touch. Fixes #3