Reinstating previous logic as it seems it was correct after all