quick fix and improvement