Temp fix. Full implementation will be later