Fix for ca280f95395bef558d683b7ccb22ae09c612dd73.