Compiled fix for previous bug