Fix automagically add stuff