simplified
fixed patch and path