Fixing bug with classes aliasing