fix this a bit