FINALLY FIXED DA BUG