[improved] fix from last commit