Promisable
Fix for production use
Update