Fix for constants replacement