Final devices fix