fixed #8 temporary solution