Fixed issue with common device