diff --git a/src/main/java/com/github/demidko/aot/WordformMeaning.java b/src/main/java/com/github/demidko/aot/WordformMeaning.java
index 28aefa6..380abbd 100644
--- a/src/main/java/com/github/demidko/aot/WordformMeaning.java
+++ b/src/main/java/com/github/demidko/aot/WordformMeaning.java
@@ -39,8 +39,8 @@ private WordformMeaning(int lemmaId, int flexionIndex) {
    */
   public long getId() {
     BitWriter w = new BitWriter();
-    w.write(lemmaId, 4);
-    w.write(flexionIndex, 4);
+    w.writeInt(lemmaId);
+    w.writeInt(flexionIndex);
     return w.toLong();
   }
 
@@ -97,10 +97,10 @@ public static List<WordformMeaning> lookupForMeanings(String w) throws IOExcepti
    * @param id идентификатор полученный ранее при помощи {@link WordformMeaning#getId()}
    * @return словоформа смысла
    */
-  public static WordformMeaning lookupForMeaningById(long id) throws IOException {
+  public static WordformMeaning lookupForMeaning(long id) throws IOException {
     BitReader reader = new BitReader(id);
     int lemmaId = reader.readInt();
-    int flexionIndex = reader.readShort();
+    int flexionIndex = reader.readInt();
     getDictionary();
     return new WordformMeaning(lemmaId, flexionIndex);
   }