fixed regression caused by 05a9dd9; minor adjustments