Fixing instances creation