improved quick fix
3 files changed