Bug fix: Added static