try to make it work right