proper fix for incremental