Aaand... first bug due to the refactoring found. And fixed.