0.0.57: REALLY fixed generic calls this time