Ex.2 - Quick fix