added the fix for the move to headers