Compiling & fixed bug