Fix some wastefull calling