made some attempts to fix problem