Complete and fix [1049]