Promised fix for GitHub