Final Fix

Finally my fixes work like expected.