Temporary override to address #13