Fixed #516. Made lawboard a bit faster in the process