bugfixes with perennial mode