workaround and code organizzation