Ugly workaround for binpath issue