Fix for 5ea41275b36f43dca9ea1c5bc3db196bf4aba5d8