Fix power saving (by Thiago)