scalar adopted
bugfixing