Fixed leftover values