Make setup working properly