[no-task]: some minor bugfix