Fix for maven variables