Fixed error with 409 and old code