Fix recent bug