Fixed the wannabe BAWS