- Temporary fix for the previous bug