small fix but still not working well