Trying to fix decrementing problems