fix for production? method