Fixed and tested