Fix/awesome