Here's a quick fix for #63