Pro changes, fixes #1744