Temporary solution before #69 will be done