fixed merge from winfr34k