#1079 removed unreachable part of code