Bug fix for the empty class