Fixed interfaces saving

Change-Id: Idbe9cc003895fe12736efc95d2a70178428427c9