Revert "Revert "Fixed da bug. Right?""

This reverts commit bdbfa6426f7937d061a08d446c6d3d5d96c81636.
Revert "delete me"

This reverts commit ba31f8fe2b02c70a7c5cd5deabf14ec2a8502aed.