fixed tuple dispatch issues