Bug Fix in Wrappers