FIX: failing test blk-sk35.
FIX: minor code improvement.