Fix problems (24/25)

Fix problems