Yet another fix. Will definitely need to refactor and cleanup noise
later.