Good idea. Also I found some other bugs in the way I handled this, so new commit coming soon...