[19] - Fixes