fix for Claudio and dev