Bug fix: make things work without module