Fixed issues with woocommerce version 2.1.5