[derek] toplevel fix