Type soundness fixed for single definitions