Fixed wrongly merged branch