ugly type manipulations removed