Possible bug fix
Merge remote-tracking branch 'onasafari/master'
still fails