fixing some bs