Fix abstraction problem