Fixed problem with elif