fixed handling