awdavies90

I initially wanted to add this as a comment on #855 as think (reading between the lines a bit) that I might be seeing the same/similar issue but didn't have...