Moved source to before saving

Pls work