Fixes upstream #16