#71 fixed ClassCastExceptions;