Bug fixes... Not working yet