patch #16 applied cleanly. Moving to RTBC +1