Testing and fixing commit