Fixed else parsing