Update #325 - Temp fix for this issue