Final commit to bring back stability