Restored functionality of previous version