Correcting bugs. Previous way didn't really worked at all
2 files changed