Previous commit was failing silently, this one is better