Fixed: ACT-1528