FIX: Build in close key check