More experiments with better hotswap.
Typo fix.
Hackless solution, but still it's not bullet proof solution..