simple rewrite
fixes notices in dev env