Feature/book 434

And this time do not remove this fix ;)