a little bit of fix