Suggested fix for #22