Solved minor issue with save to device