Keep overlay system. Fixes #261