Fix for init