Try to get rid of hack in better way.