Updated with additional patch provided by page.ly for freeskier.