Fix for #133 #128 #127

@amitaibu I would need to see it in testflight to confirm the fix