better solution for the previous fixed