Should fix iOS issues

Closes #36