Roman's changes
Fix captures