Fix case where the decorator's init function could be called twice.

Fix case where the decorator's init function could be called twice. #2386