Fixes broken feature