added temp fix for magento bug in 1.7.0.2, need to investigat and do proper one later