I'd rather make this as one workaround... need to fix