Fix for future capability