fixed annotations and checks