Temporary solution to address #9