Use better stack API, fixes broken test