Possible fixes for #181 that need to be tested on staging.