Fix for lighter weight logic