Working on #143, need to test in iOS