#124: fixed few bugs