Added lock to prevent double fillups.