Fixed non polymorphic behaviour