Bugfixing (fixed critical bug with variable edition)