Fix for i.5