temp fix for a bug, need to do real fix later