Fix #533

@garyb @joneshf Mind having a look?