Fixed a bug that was causing ClassCastExceptions.